Quartz: Fix incompatible types in assignment
authorJohn Ralls <jralls@ceridwen.us>
Fri, 2 Mar 2012 01:00:35 +0000 (17:00 -0800)
committerJohn Ralls <jralls@ceridwen.us>
Fri, 2 Mar 2012 01:00:35 +0000 (17:00 -0800)
NSEvent -scrollingDeltaX and -scrollingDeltaY aren't defined before
10.7, so objc assumes that they return a pointer. Trying to cast to a
float generates a compiler error.

gdk/quartz/gdkevents-quartz.c

index 58bc58ba1160c987c1e870ed76fbf08919658d96..7ae6a69402a4184f61b4e5cc81e62c45149e79cd 100644 (file)
@@ -1325,7 +1325,7 @@ gdk_event_translate (GdkEvent *event,
         GdkScrollDirection direction;
        float dx;
        float dy;
-
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
        if (gdk_quartz_osx_version() >= GDK_OSX_LION &&
            [nsevent hasPreciseScrollingDeltas])
          {
@@ -1338,7 +1338,7 @@ gdk_event_translate (GdkEvent *event,
 
             /* Fall through for scroll buttons emulation */
          }
-
+#endif
         dx = [nsevent deltaX];
         dy = [nsevent deltaY];